DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: Iab66369ad3b3d3f951c428895fc9402846b9ad19